Hello,

situation

We our little company with 3 people, each has a localhost webserver and most projects (previous and current) are on one PC network shared disk. We have virtual server, where some of our clients' sites and our site.

Our standard workflow is:

Coder PC ? Programmer localhost ? dev domain (client.company.com) 
                                        ?
                                  live version (client.com)

It often happens, that there are two or three guys working on same projects at the same time - one is on dev version, two are on localhost.

When finished, we try to synchronize the files on dev version and ideally not to mess up any files, which *knock knock * doesn't happen often.

And then one of us deploys dev version on live webserver.

question

we are looking for a way to simplify this workflow while updating websites - ideally some sort of diff uploader or VCS probably (Git/SVN/VCS/...), but we are not completely sure where to begin or what way would be ideal, therefore I ask you, fellow stackoverflowers for your experience with website / application deployment and recommended workflow.

We probably will also need to use Mac in process, so if it won't be a problem, that would be even better.

Thank you